Minor enhancements to event system