Updated win32 support slightly.