Fixed comments / typos
(cherry picked from commit 096348fa7984bb86201c50d8e8e030059af2fb6d)
5 files changed