Address lint issues