Scheduler improvements.