Finish field get/set value
Tidy up back-ported code
Add missing comma