[DF-4841] Macos|ios project fixes