Added fixes for rosbag