More changes for Travis CI