Metrics Fixes