Minor changes to CMakeList