SWEEP_CONTROL: more fixes from testing