Fix the Mac build with a newer compiler