Additional tweaks for Travis-ci