More travis fixes