[PATCH 0/3] [bugfixes] based on STIG feedback