Fix non-EVENTS build