[upstream] Typo and errors