Some last tweaks for CMake
Some last tweaks for CMake