Critical fixes for event recording