Snow Leopard: More fixes to object dependencies