Fixes for block_device creation and restoration