Minor tweaks to UpdateWindow interface