Added lint error suppression comments