More field fixes