Tweaks for Travis CI