[[ Bug 12822 ]] Fix OSX build errors