Some small changes to XML schemas