Merge "Attempt to fix Mac build"