Fix lint problems