Fixed regression bugs in the numbering & locator.