[OE-3517] Minor admin tweaks