Better win32 support