Char chooser fixes
More char chooser fixing