More fixups of track number padding