fixes for ROS Indigo