Scheduler/tasks improvements.