Fix some broken event handlers.