Second attempt at fixing the Windows build