MSWin Fixes