Fix proposals for JAXB-980, JAXB-981 and JAXB-983

Fix proposals for JAXB-980, JAXB-981 and JAXB-983