Fixes to person selection.