diff --git a/scst/src/dev_handlers/scst_fileio.c b/scst/src/dev_handlers/scst_fileio.c
index 3113f637f..bb4480afe 100644
--- a/scst/src/dev_handlers/scst_fileio.c
+++ b/scst/src/dev_handlers/scst_fileio.c
@@ -47,7 +47,7 @@
 #define SCST_FIO_REV			" 096"
 
 #define READ_CAP_LEN			8
-#define READ_CAP16_LEN			32
+#define READ_CAP16_LEN			12
 
 #define MAX_USN_LEN			20
 
diff --git a/scst/src/scst_mem.c b/scst/src/scst_mem.c
index 5fca2ecf0..a35c4517a 100644
--- a/scst/src/scst_mem.c
+++ b/scst/src/scst_mem.c
@@ -31,7 +31,6 @@
 
 #include "scsi_tgt.h"
 #include "scst_priv.h"
-#include "scst_debug.h"
 #include "scst_mem.h"
 
 /*