Merge branch 'lp/typofixes'