Merge branch 'ob/typofixes'