Changed some things with CMake