Fixed minor bugs due to introduced changes in Gazebo and ROS