do these WINDOW_DEBUG changes belong in this commit? they seem unrelated