fix typos
fix typos
fix typo
Back porting patches.
Merged.