Fix some comments
(cherry picked from commit 48cabf027bf4de9fa7b662583b10713dfea8b070)