Fix: metrics fixes