[OE-3514] tweaks