some small modifications to get catkin to work