roll-over fixes