Mailcatcher fixes