More doc block fixes