Fixes for WIN32...