Snow Leopard: More build fixes