Fix: metrics fixes
Merge pull request #90 from VasilyKolpakov/fix/metric_fixes

Fix: metrics fixes