Fixes for -Wshadow warnings