[OE-4203] Eyedraw related fixes