Snow Leopard: More fixes to object dependencies
Merge remote-tracking branch 'origin/master'