More vertical metrics tweaks