Fix for Travis CI build failures