[MAC] Some fixes to build on Mac