Linter fixes and more settings