More tweaks for Travis CI