Pagination; some fixes