Fixes for metrics in response time