minor catkin/bloom fixes