Fix up events