DocBlocks fixes