Errors in CSDL "16.1 Products and Categories Example" and "15.4 Properties"

The example uses Uris of the form:

http://docs.oasis-open.org/odata/odata/v4.0/cs01/vocabularies/...

but should use:

http://docs.oasis-open.org/odata/odata/v4.0/os/vocabularies/...

Also, the example has:

<Annotation Term="Core.OptimisticConcurrencyControl">

which should be:

<Annotation Term="Core.OptimisticConcurrency">

Example 75 in 15.4 has

"QualifiedName":"Core.OptimisticConcurrencyControl",
"Name":"OptimisticConcurrencyControl",

and should be

"QualifiedName":"Core.OptimisticConcurrency",
"Name":"OptimisticConcurrency",