More tweaks to Travis CI scripts