Docblocks fixes