CMakeLists small changes