Merged in some WIN32 changes.