Scheduler improvements