Improve winwidth/winheight behavior