3.0 - Fix some doc blocks

As part of #2677