Minor changes to make the code compile on ROS Groovy.