minor changes in the remote impl