[OE-2716] bugfixes