More paging improvements