Minor changes to Robot Servers