More fixes for Travis CI.