mac version build fixes