Fix mac compile issues