Minor updates to Event classes