More Travis CI fixes.