Fix unit/scale order in relation to stats