Minor dispatcher redesign