Some changes to library/pager