[OE-3643] Create fixes