Fix some issues that crept into the schema files