Fixed the issues with CMakeFiles and more