Fix some MailMate setup issues