Fix remote execution problems