Correct some lint related issues.