Fix regressions in scsi_internal_device_block