More fixes/improvements for AssignCharacterDialog