Fixing some bugs in the schema files.