Improve log messages to avoid confusion
Fix bugs with persistence with multiple events