Fixes for pager