Merge branch 'js/misc-fixes'