Fix a few events and typos