Fix let bindings to allow visibility