Tweak load order again