[OE-3949] tweaks