More numbering fixes