Various tweaks and fixes for rollups