Clustered error fix. Metrics error fix