Robot fixes.

Also fixes #5244.