Fixes to object manipulation.