Fixes for .travis.yml