[OE-2589] bugfixes