Disk metrics fixes