Fix up Decimal/UCUM support