Fixed some bugs in the schema.