mswin fixes