prep work for supporting no_cyclic_preemption, and a minor bug fix