fixup! fixup! fixup! More changes for travis