Event fixes

Addresses: https://github.com/walmartlabs/thorax/issues/149