Minor fixes based on package catkin_lint