Resolve a few bugs around the new paging functionality.