Fixed more js errors