Some fix in events manager