Hopefully a fix to hang problems on the Mac build machine