Fix Travis CI build failures