Overflow tweaks