Fix event selectors