Fix new lint errors