Scheduler fixes and updates