[DF-185] Fix: MacOS & iOS project fixes