Some fix up for hound comments