Fixed warnings about the shadowing of bindings