More TaskScheduler changes