Fix remote setup