Cmake small updates to match Makefile