Fix schema definitions.