[OE-4750] tweaks