Fix issues tied to client field rename.