Readd mesher
Fix CMake inconsistencies