Fix remote call AST