more fixes to the paging system