Several fixes to solve the analytics/conversion data problem + versioning