Fix binding and rendering bugs