Fixes to field generators under the new system.