Lint Fixes Part 2