Minor fixes in schema.