Fix events and classes with missing fields