Fixes to object model.