Tweak to KPI calculator and data upload mechanisms