Metric Fixes