[DF_517] small fixes to win version