Fix lint recommendations