Revert "Revert "More field fixes""

This reverts commit a7cd243b3274c82d70d2845be1a0f230fb59dfa2.