Fix BranchEvent headers