Tweaks for metrics - future features