[DF-1211] win fixes