Further fixes to travis.yml.