Disks refactoring: Fixes after review