3.0 cs fixes

for doc blocks.
I don't think this change was intended.