Fixes some numbering, and references to that numbering.