Fixes to the security model.