And some more loading fixes!