Fixed a couple of bugs in RemoteControl solver