Event fixes

More on the way, but this is safe to merge as-is.