More fixes to CMakefiles, and fix to ohmu grammar.