diff --git a/scripts/generate-kernel-patch b/scripts/generate-kernel-patch
index ea418b90c..25e14b445 100755
--- a/scripts/generate-kernel-patch
+++ b/scripts/generate-kernel-patch
@@ -121,7 +121,7 @@ function specialize_patch {
       )
   fi
   local kver3
-  set -- ${kver//./ }
+  set -- ${kver//[.-]/ }
   if [ -n "$3" ]; then
       kver3=$1.$2.$3
   else
diff --git a/scst/include/scst_event.h b/scst/include/scst_event.h
index fbdec5b6c..ebcbd80c9 100644
--- a/scst/include/scst_event.h
+++ b/scst/include/scst_event.h
@@ -23,8 +23,6 @@
 #define SCST_EVENT_PATH			"/dev/"
 #define SCST_EVENT_DEV			SCST_EVENT_PATH SCST_EVENT_NAME
 #define SCST_EVENT_VERSION_NAME		SCST_VERSION_NAME
-#define SCST_EVENT_VERSION		\
-	SCST_EVENT_VERSION_NAME "$Revision: 2454 $" SCST_CONST_VERSION
 
 #ifndef aligned_u64
 #define aligned_u64 uint64_t __attribute__((aligned(8)))
diff --git a/scst/src/scst_targ.c b/scst/src/scst_targ.c
index e058879bd..818e2d816 100644
--- a/scst/src/scst_targ.c
+++ b/scst/src/scst_targ.c
@@ -2696,19 +2696,19 @@ out_done:
 typedef enum scst_exec_res (*scst_local_exec_fn)(struct scst_cmd *cmd);
 
 static scst_local_exec_fn scst_local_fns[256] = {
-	[COMPARE_AND_WRITE]	= scst_cmp_wr_local,
-	[EXTENDED_COPY]		= scst_cm_ext_copy_exec,
-	[MAINTENANCE_IN]	= scst_maintenance_in,
-	[MAINTENANCE_OUT]	= scst_maintenance_out,
-	[PERSISTENT_RESERVE_IN]	= scst_persistent_reserve_in_local,
-	[PERSISTENT_RESERVE_OUT]= scst_persistent_reserve_out_local,
-	[RECEIVE_COPY_RESULTS]	= scst_cm_rcv_copy_res_exec,
-	[RELEASE]		= scst_release_local,
-	[RELEASE_10]		= scst_release_local,
-	[REPORT_LUNS]		= scst_report_luns_local,
-	[REQUEST_SENSE]		= scst_request_sense_local,
-	[RESERVE]		= scst_reserve_local,
-	[RESERVE_10]		= scst_reserve_local,
+	[COMPARE_AND_WRITE]	 = scst_cmp_wr_local,
+	[EXTENDED_COPY]		 = scst_cm_ext_copy_exec,
+	[MAINTENANCE_IN]	 = scst_maintenance_in,
+	[MAINTENANCE_OUT]	 = scst_maintenance_out,
+	[PERSISTENT_RESERVE_IN]	 = scst_persistent_reserve_in_local,
+	[PERSISTENT_RESERVE_OUT] = scst_persistent_reserve_out_local,
+	[RECEIVE_COPY_RESULTS]	 = scst_cm_rcv_copy_res_exec,
+	[RELEASE]		 = scst_release_local,
+	[RELEASE_10]		 = scst_release_local,
+	[REPORT_LUNS]		 = scst_report_luns_local,
+	[REQUEST_SENSE]		 = scst_request_sense_local,
+	[RESERVE]		 = scst_reserve_local,
+	[RESERVE_10]		 = scst_reserve_local,
 };
 
 static enum scst_exec_res scst_do_local_exec(struct scst_cmd *cmd)