Fixes in events