Fix jaxb generation

Separate JAXB changes as discussed in #1 and #3