[MAT-403] patch up windows mistakes and retry