some fixes to allow the ROS data gen simulation to run better