Fix load order issues