More travis fixes
More fixes