Fix event handlers.