More JS fixes.