Fix event bindings