Certain fixes to help win32 compile, not yet achieved.