(Apple) More fixes for building on snow leopard.