Fix remote, fix --list