Tweaks to get confirm form redrawing