Fixed list numbering issues