Fix issues with Travis CI