Robot fixes.

Also fixes #5244.
Oh, very good point, that's something I did change.