More Travis CI fixes part 2.