Fixed some issues with deferred loading of fields.

32 remaining failures, 83 errors.