Additional JS tweaks