Fix up the schema generation