fix collection calls for new jaxb code