Small eventing and logging adaptations