Fix Broken Revenue Tracking and | i800services (Legacy)