Fixes for resizes