More tweaks for travis.