Fix CMake paths problems