Some cmakelist changes