Fix broken event triggers