Fixed Event schema defects