More JS fixes, esp. in admin JS