changes to instance and disks logic a a part of #427