security/mandrill fixes