DocBlock fixes