Further fixes to <Field />