mac os x build fixes