[DF-1211] macos fixes