Fixes for single-threaded fetches, plus page numbering