Typo fix and update for next branch 3