Fix a few issues found during fine-tuning (#2582)

ming030890

2025-07-04 a750595594321833b48dc19798eed66876a100b4

1
2
3
4
5
6
7
8
9
one    1
two    2
three    3
four    4
five    5
six    6
seven    7
eight    8
nine    9