Further minor fixes for TooManyEvents