Fix few lint errors