Schedulers fixes