Fixes for possible not matching with mailer class