Fix load order so s is available.