Fix cmake upgrade issues #2