Fix and issue comments