more tweaks to fix cmake building