Fix a couple of minor bugs

No changes file since it's a part of the bigger feature of events.