[OE-2546] bugfixes