Pagination fix-ups.