Fixes to the (silently failing ... grrr) JAXB annotations.