Fix remarks in #9848