20675: Fix some small robo bugs

Top