[OE-3301] bugfixes