More JS tweaks