Minor update to EventDetector