Merge branch 'ak/typofixes'