Merge branch 'vs/typofixes'