Merge "Fix mac build"