[DF-185] MacOS project fixes