Fixing the build! Some minor bugs due to mailer changes