CMExt and CMakeList files minor fixes