[DF-5161] Fixing OS X build