Load order tweaks