Fix a couple schema-related changes.