Fixes for js file