Fixed pager + cleanup.