Gazebo related updates