WIN32 improvements #24