Fixing multiwindow refactoring for Windows target