[DF-1785] Fixed Mac os issues