diff --git a/mvsas_tgt/mv_sas.c b/mvsas_tgt/mv_sas.c
index 6dc041aaa..4fc32b1d8 100644
--- a/mvsas_tgt/mv_sas.c
+++ b/mvsas_tgt/mv_sas.c
@@ -411,17 +411,11 @@ int mvs_slave_configure(struct scsi_device *sdev)
 
 	if (ret)
 		return ret;
-	if (dev_is_sata(dev)) {
-		/* may set PIO mode */
-	#if MV_DISABLE_NCQ
-		struct ata_port *ap = dev->sata_dev.ap;
-		struct ata_device *adev = ap->link.device;
-		adev->flags |= ATA_DFLAG_NCQ_OFF;
-		scsi_adjust_queue_depth(sdev, MSG_SIMPLE_TAG, 1);
-	#endif
-	} else
-		sas_change_queue_depth(sdev, MVS_QUEUE_SIZE);
 
+	if (!dev_is_sata(dev))
+		sas_change_queue_depth(sdev,
+			MVS_QUEUE_SIZE,
+			SCSI_QDEPTH_DEFAULT);
 	return 0;
 }
 
diff --git a/mvsas_tgt/mv_tgt.c b/mvsas_tgt/mv_tgt.c
index 858e94b4e..c7eb06ce2 100644
--- a/mvsas_tgt/mv_tgt.c
+++ b/mvsas_tgt/mv_tgt.c
@@ -316,7 +316,7 @@ static int mvst_target_release(struct scst_tgt *scst_tgt)
 	wait_event(tgt->waitQ, test_tgt_sess_count(tgt, mvi));
 
 	/* big hammer */
-	if (!mvi->flags & MVF_HOST_SHUTTING_DOWN)
+	if (!(mvi->flags & MVF_HOST_SHUTTING_DOWN))
 		mvi->flags |= MVF_TARGET_MODE_ENABLE;
 
 	/* wait for sessions to clear out (just in case) */