Fix event subscription issues