Updated build for Macs