OZP-692: few fixes