Tweaks to cmake files