Merge branch 'mi/typofixes'