Pager Code review fixes