Merge branch 'en/typofixes'