CMake files adjustments