Fix up slight Scheduler issues with shutdown