Trying something to fix build errors on Windows...