Fix event listeners