A few fixes with resizing