few event fixes