[stable-v2.0] fix build on gcc 13.x and some typo

[stable-v2.0] fix build on gcc 13.x and some typo #138