Some more modifications for Windows.