Merge "Fix more of the Mac build."