Small loading tweaks