Metric fixes