Change physical disks to loopback devices. Some more fixes