Small fixes to events and Dashboard