Temporary fixes for WIN32...