Mac build updates


The changes needed to build on the Mac