Changes to support Macs