Fixing various JS file loading