Correct a compilation error
Correct lint warnings