Re: [PATCH] [bugfixes] additional changes from STIG feedback