Fixes for multiwindow refactoring, Windows target

These are fixes for compile time errors.