Lint Fixes Part 2

And here.