Fix some bugs in events calls