Fixing build errors from moving event classes and merging.