Update metrics to fix unit issues