More travis fixups