Merge branch 'js/typofixes'