Js Fixes