Numbering fixes