Additional fix for metrics re vms