Minor fixes to ModelUnits.