Cmake Fixes