[PATCH 0/2] [bugfixes] following STIG feedback