Fixed Mac build broken by Windows changes