Fix SchemaUtility