Syntax error fix, CMake tweaks