Tweaks to router and pager