[OE-2635] tweaks to preoperative a