some paging fixes