More fixes for travis.