Fixed up the schema fields