Fix lint violations