More resizing/movement fixes