Doc fixes related to #9523