More fixes to field updating