Correct schema references.
Not really changed.