Put unit types out of the way