Tweaks to object conversion