Tweak things to fit the security documentation.