Fix up all the schemas