Fix some events for better logging