Fix lint issues and missing import.