Fixes for baxter/gazebo integration