[PATCH] additional patches following STIG feedback