[OE-3301] tweaks