Overflow modifications