Tweaks to get recent updates to compile on MacOS