diff --git a/iscsi-scst/kernel/iscsi.c b/iscsi-scst/kernel/iscsi.c
index a0ffe3958..be7b3ff7b 100644
--- a/iscsi-scst/kernel/iscsi.c
+++ b/iscsi-scst/kernel/iscsi.c
@@ -2317,6 +2317,11 @@ static void __cmnd_abort(struct iscsi_cmnd *cmnd)
 	unsigned long timeout_time = jiffies + ISCSI_TM_DATA_WAIT_TIMEOUT +
 					ISCSI_ADD_SCHED_TIME;
 	struct iscsi_conn *conn = cmnd->conn;
+#ifdef CONFIG_SCST_EXTRACHECKS
+	struct task_struct *rdt = cmnd->conn->rd_task;
+#else
+	struct task_struct *rdt = NULL;
+#endif
 
 	TRACE_MGMT_DBG("Aborting cmd %p, scst_cmd %p (scst state %x, "
 		"ref_cnt %d, on_write_timeout_list %d, write_start %ld, ITT %x, "
@@ -2330,8 +2335,7 @@ static void __cmnd_abort(struct iscsi_cmnd *cmnd)
 		cmnd->r2t_len_to_send, cmnd_scsicode(cmnd),
 		cmnd_write_size(cmnd), cmnd->outstanding_r2t,
 		cmnd->conn->session->exp_cmd_sn, cmnd->conn,
-		cmnd->conn->rd_task, cmnd->conn->read_cmnd,
-		cmnd->conn->read_state);
+		rdt, cmnd->conn->read_cmnd, cmnd->conn->read_state);
 
 #if defined(CONFIG_TCP_ZERO_COPY_TRANSFER_COMPLETION_NOTIFICATION)
 	TRACE_MGMT_DBG("net_ref_cnt %d", atomic_read(&cmnd->net_ref_cnt));
diff --git a/iscsi-scst/kernel/iscsi.h b/iscsi-scst/kernel/iscsi.h
index 5875fbd2a..908068bd0 100644
--- a/iscsi-scst/kernel/iscsi.h
+++ b/iscsi-scst/kernel/iscsi.h
@@ -280,7 +280,9 @@ struct iscsi_conn {
 
 	struct list_head rd_list_entry;
 
+#ifdef CONFIG_SCST_EXTRACHECKS
 	struct task_struct *rd_task;
+#endif
 
 	unsigned long last_rcv_time;
 
diff --git a/nightly/conf/nightly.conf b/nightly/conf/nightly.conf
index de777d24f..46a9338f2 100644
--- a/nightly/conf/nightly.conf
+++ b/nightly/conf/nightly.conf
@@ -3,17 +3,17 @@
 ABT_DETAILS="x86_64"
 ABT_JOBS=5
 ABT_KERNELS="  \
-4.0.6          \
+4.0.7          \
 3.19.7-nc      \
 3.18.8-nc      \
 3.17.8-nc      \
 3.16.7-nc      \
 3.15.10-nc     \
-3.14.45-nc     \
+3.14.46-nc     \
 3.13.11-nc     \
-3.12.38-nc     \
+3.12.44-nc     \
 3.11.10-nc     \
-3.10.81-nc     \
+3.10.82-nc     \
 3.9.11-nc      \
 3.8.13-nc      \
 3.7.10-nc      \
diff --git a/scst/src/dev_handlers/scst_vdisk.c b/scst/src/dev_handlers/scst_vdisk.c
index 93fde3020..fb96d30ff 100644
--- a/scst/src/dev_handlers/scst_vdisk.c
+++ b/scst/src/dev_handlers/scst_vdisk.c
@@ -2721,7 +2721,7 @@ static int vdisk_get_supported_opcodes(struct scst_cmd *cmd,
 		*out_supp_opcodes_cnt = ARRAY_SIZE(vdisk_opcode_descriptors);
 	} else {
 		*out_supp_opcodes = vdisk_opcode_descriptors_type2;
-		*out_supp_opcodes_cnt = ARRAY_SIZE(vdisk_opcode_descriptors);
+		*out_supp_opcodes_cnt = ARRAY_SIZE(vdisk_opcode_descriptors_type2);
 	}
 	return 0;
 }