Fix all the custom events