Fixes to pager