Fix upcoming events