Fix shutdown of scheduler helpers