Formatting of security-related code
Fixes to related items