Fix a couple of regressions in events