Latest Scheduler fixes