Fixes to get build running again on macOS. Basically, re-applying changes from #41
Fixes to get build running again on macOS. Basically, re-applying changes from #41

TomPallister/Ocelot,TomPallister/Ocelot,geffzhang/Ocelot,geffzhang/Ocelot