Fixes to Scheduler