Scheduler: misc fixes