Fixed more remoting issues
More remoting fix