Fixes in JS