Additional fixes to travis.yml