Minor Js adjustments