re #9601 resolve two sphinx warnings