Handle any user-specified fields which clash with auto-generated attributes