Small fixes in CMakeLists.txt and Header