Cmake Tweaks