More adjustments due to travis-ci/travis-ci#2220