Some more fixes following pixelwise resize changes including one for Bug#16306.