Fixing event format switch related bugs