Tweaked a couple of metric names and logging