Data and events big fixes