More changes to try to make Travis CI work