More tweaking for Travis CI...