[DF-185] macos fixes