More rollover data fixes