Third attempt at fixing the Windows build