mandrill fixes