Initial fix for Decimal <-> BigDecimal