Fixed all possible conflicts with CMake build script