Fix lots of linter errors