Fixes for the pager