Pager optimizations, minor Lint bug fies