Fixes for WIN32...
Cleanup...