Updates to Cmake files