Travis

More travis fixes