Fixes
Small changes to CMake file