Repair some lint errors