More (minor) adjustments to the schemas.