Update for Travis CI build issues