Addressed fixes in Note 22 and 23.
Merging in 1660-publication-updates.