Clean up the BigDecimal issue, and readonly fields