Fixing Travis CI bugs