Multiple fixes for Windows x86 p/invoke test failures. (#3186)