[DF-4070] Fixed MAC os issues