Final fixes
Lint errors