Minor updates to the event monitor