Fix Travis CI issues (travis-ci/travis-ci#2220)