Scheduler fixes