Further JS tweaks.