Massive Lint Fixes