Updates and corrections for DOC-169