Map JS tweaks