Fixup CMakeLists.txt's and package.xmls