More fixes for Windows build.

This seems to unregress stuff.