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

ming030890

2025-07-04 a750595594321833b48dc19798eed66876a100b4

1
2
3
4
5
6
7
8
9
10
11
12
13
12    0
1    13
2    14
3    15
4    16
5    17
6    18
7    19
8    20
9    21
10    22
11    23
12    24