OZP-119 - trying fix build issues