3.0 cs fixes

for doc blocks.
Indeed.