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

ming030890

2025-07-04 a750595594321833b48dc19798eed66876a100b4

1
2
3
4
5
6
7
8
9
i    1
ii    2
iii    3
iv    4
v    5
vi    6
vii    7
viii    8
ix    9