Fix remote stuff