Updated CMakeModules; small fixes.