Yet more roll fixes