Fix small errors in changes to support display name only