Fixes for ROS Indigo