[OE-3941] tweaks