Yet more changes for paging bug