#2353 - more resizing tweaks