Correctly ref the events members

Some small fixes too