Merge "Fix build on mac."