Fix event driver compatibility