Small Scheduler changes