2.2 pc win fix

It needs to be verified that these changes do indeed make the PageCacheStressTest pass on Windows.