Fix some lint errors