scheduler: fixes