Merge "Fix Mac build"