[OE-3516] Minor tweaks