Fixes mailcatcher issues