fixups to schema declaration