Scheduler Fixes