Merge "Random comment typo fixes"