Fixed optional BigDecimal NPE, added java.util.Calendar support refs