Cleanup Create event mistakes

based on and for commit Intel code fixes p.t 3