Merge branch 'ma/typofixes'