Robot_Control fixes. See #1709 #1599.