Several Lint Fixes