Fix some load order issues