Fixes to object conversion.