Fixes for Gazebo 1.9