Small tweaks to compile on Windows.
More compile fixups for windows.