Fixed some more with the new field handling