WIN32 improvements patches

See #24