Robots fixes, enhancements