fix O3 compilation error and correct words also

Signed-off-by: Keff <funnykeff91@gmail.com>