[OE-2492] eyedraw2 bugfixes