[OE-2609] Bug fixes