Fixes to units in preparation of automatic best unit display