Fix mosts lint errors