CMake polishing & gcc fix.