Minor Bugfixes for KPI Reports