Fixes in js
Fixes in js