Follow up to #9778: fix regressions on 64-bit Windows builds
4 files changed