Merge "More Mac build fixes."