Fixed issues in package.xml and CMakeLists