Mandrill Fixes