More bug fixes for units.