[OEM-109] bugfixes