small js fixes
Merge branch 'release/v1.1.3'