More fixes for travis