More js fixes