Fix some event listeners