Minor numbering cleanup