Fixes to the pager control