More Travis CI fixes