Docblock cs fixes