Fix a few comments that generated warnings for yard