Fixes a CMake bug
Fixes a reordering error and comment warning