Char select fixes