Warning fixes

Mostly variable shadowing.

-[Unknown]