More bugfixes in robot logic