fixing some bugs in the schema