Fixes for cloudrobot