OZP-60: Fixing build errors