[[ Bug 12324 ]] Fix OSX build errors