[PATCH 0/3] STIG bugfixes