Fix some things in the schema