More bugfixes on the numbering when drafting.