- Setting default to JAXB (instead of JSON) and minor fixes