Fixups for Travis