Fix errors introduced by lazily loading display name