Fix binding scopes