Preliminary changes to fix breaches detected by the security audit