travis: some more fixups