Fixup remotes