Fixed up a few event declarations