Oid: correct the length
Some perf work