Multiple windows fixes