Correct event commands and their serialization