Buildsystem fixes suggested by catkin_lint