Minor changes to event_manager.rb