fix wrong comment (partial cherry-pick of 966a04b)
fix typo