A couple of CMake fixes, mostly cflags related