DOC-87 3 small fixes that were missed in the last big set of changes.