Fixes to the roll-up