Fix lint failures