mac build fixes