Minor improvements to the Pagination class