Hotfix: metrics fixes