Some minor tweaks to the schema.