Actualize fixes
Events tracking code