DocBlock and CS fixes