Some fixes and pager.