Fixes to Travis CI script