window based fixes