Fix more warnings (mostly shadowing)