metrics fixes