MultipleWindows fixes.