Fixed handling of unit conversions.