Fix -Wshadow warnings