Gazebo related changes.