JS fixes