Fixing some GA events