Typo fixes
Merge branch 'my'