Fix a couple of event conflict issues