Add a few more hacks for rollups

Hopefully to be removed when the API supports
setting intervals directly.