few more js fixes