Rework the blockdev handling