Minor Travis CI fixes