Js fixes