Fixes event creation check/assertions