Improve scheduler robustness and logging