More tweaks for Travis