fix more random errors

@jeremy @bf4 @mikel 

fixes https://travis-ci.org/mikel/mail/jobs/33718007