small improvements to remoting subsystem
Merge pull request #6056 from ctomc/remoting

small improvements to remoting subsystem