Actually fix the schema this time