More Pagination Fixes