More fixes on resize