Small fixes to fields