Some minor fixes needed after the xsdata merge. #1421