Fix common event header parsing