Fixes to aspects of using the pagination based API