Catkinization fixes and rosparam fixes