Fixes based on TWN suggestions
Fixes based on TWN suggestions

kidaa/eol,kidaa/eol,DanielZhangQingLong/eol4,DanielZhangQingLong/eol4,kidaa/eol,DanielZhangQingLong/eol4,DanielZhangQingLong/eol4,kidaa/eol,DanielZhangQingLong/eol4