[DF-4873] Fixed Mac os compiling issues