[ros-diffs] [gadamopoulos] 60945: [shell32] - Fix a couple of bugs I introduced in latest commit