Fix binding/context errors