CMake fixes + Log cleanup.