Other updates on cmake files