Some more loading tweaks