unit/quantity related bug fixes