[3.0] Tweak the loading order a bit