[OE-3096] bugfixes