Fixing a number of small items... starting on paging.