Fix Proper Dependency Shutdown Ordering