More changes to Javascript loading