diff --git a/configure/CONFIG_MODULE b/configure/CONFIG_MODULE
index cc63302ccd0aaa594cc82023e57f3cb9bab81bef..9fa5cd055036a843e4b4dc39be150a9ea0efead5 100644
--- a/configure/CONFIG_MODULE
+++ b/configure/CONFIG_MODULE
@@ -3,7 +3,6 @@
 # However, it also could be overrided in CONFIG_MODULE.local.
 # Be careful to touch this file
 #
-#EPICS_MODULE_TAG:=tags/3.3.0
 #
 EPICS_MODULE_NAME:=${E3_REQUIRE_NAME}
 #
diff --git a/configure/RELEASE b/configure/RELEASE
index cb131b5a514fc41ac7f120a847ec2e877f063f43..124939fa59f2f2bfa9691f96ff8b3227549f3af3 100644
--- a/configure/RELEASE
+++ b/configure/RELEASE
@@ -1,4 +1,4 @@
-EPICS_BASE=/epics/base-7.0.4
+EPICS_BASE=/epics/base-7.0.5
 
 E3_REQUIRE_NAME:=require
 E3_REQUIRE_VERSION=$(E3_MODULE_VERSION)
diff --git a/configure/modules/CONFIG b/configure/modules/CONFIG
index 0286b58b55f41f275049d4c2c5dc56b8e7420efe..f0339c77c7cbc687cc3c0984d93b96af04f29f32 100644
--- a/configure/modules/CONFIG
+++ b/configure/modules/CONFIG
@@ -1,6 +1,7 @@
 # -*- mode: Makefile;-*-
 
 # Update the module version (for numeric versions) with a build number of 0 if none is specified
+E3_MODULE_VERSION_ORIG:=$(E3_MODULE_VERSION)
 E3_MODULE_VERSION:=$(E3_MODULE_VERSION)$(shell [[ "$(E3_MODULE_VERSION)" =~ ^[0-9]+\.[0-9]+\.[0-9]+$$ ]] && echo +0)
 
 include $(EPICS_BASE)/configure/CONFIG_BASE_VERSION
diff --git a/configure/modules/DEFINES_FT b/configure/modules/DEFINES_FT
index 2da7287542fc7c8e58d596445ea3b2a7ec581103..908d65ed2cfd9a26870d39aeaa65b4a92b298316 100644
--- a/configure/modules/DEFINES_FT
+++ b/configure/modules/DEFINES_FT
@@ -15,7 +15,7 @@ git submodule update --remote --merge $@/
 endef
 
 define patch_site
-patches=$$(ls $(TOP)/patch/Site/$(E3_MODULE_VERSION)-*.p0.patch 2> /dev/null); \
+patches=$$(ls $(TOP)/patch/Site/$(E3_MODULE_VERSION_ORIG)-*.p0.patch 2> /dev/null); \
 if [ -n "$$patches" ]; then \
   for i in $$patches; do \
     printf "\nPatching %s with the file : %s\n" "$(E3_MODULE_SRC_PATH)" "$$i"; \
diff --git a/require-ess/tools/driver.makefile b/require-ess/tools/driver.makefile
index 270c88b1cfe1aabb2cb4784d59794e67c74b126b..32f1390b1115b80e89c60b61d9c06097e9881091 100644
--- a/require-ess/tools/driver.makefile
+++ b/require-ess/tools/driver.makefile
@@ -145,7 +145,7 @@ endef
 #   $(call FETCH_BUILD_NUMBER,$(E3_SITEMODS_PATH),module)
 #
 define FETCH_BUILD_NUMBER
-$(shell $(E3_REQUIRE_TOOLS)/build_number.sh $(1) $(2) $($(2)_VERSION))
+$(shell $(MAKEHOME)/build_number.sh $(1) $(2) $($(2)_VERSION))
 endef
 
 ifndef EPICSVERSION
@@ -665,19 +665,6 @@ DBDFILES += $(patsubst %.stt,%_snl.dbd,$(notdir $(filter %.stt,${SRCS})))
 # Create dbd file for GPIB code.
 DBDFILES += $(patsubst %.gt,%.dbd,$(notdir $(filter %.gt,${SRCS})))
 
-# Create dbd file with references to all subRecord functions.
-# Problem: functions may be commented out. Better preprocess, but then generate headers first.
-#define maksubfuncfile
-#/static/ {static=1} \
-#/\([\t ]*(struct)?[\t ]*(genSub|sub|aSub)Record[\t ]*\*[\t ]*\w+[\t ]*\)/ { \
-#    match ($$0,/(\w+)[\t ]*\([\t ]*(struct)?[\t ]*\w+Record[\t ]*\*[\t ]*\w+[\t ]*\)/, a); \
-#    n=a[1];if(!static && !f[n]){f[n]=1;print "function (" n ")"}} \
-#/[;{}]/ {static=0}
-#endef 
-#
-#$(shell awk '$(maksubfuncfile)' $(addprefix ../,$(filter %.c %.cc %.C %.cpp, $(SRCS))) > ${SUBFUNCFILE})
-#DBDFILES += $(if $(shell cat ${SUBFUNCFILE}),${SUBFUNCFILE})
-
 # snc location in 3.14: From latest version of module seq or fall back to globally installed snc.
 #SNC=$(lastword $(dir ${EPICS_BASE})seq/bin/$(EPICS_HOST_ARCH)/snc $(shell ls -dv ${EPICS_MODULES}/seq/$(or $(seq_VERSION),$(VERSIONGLOB))/bin/${EPICS_HOST_ARCH}/snc 2>/dev/null))
 SNCALL=$(shell ls  -dv $(E3_SITEMODS_PATH)/sequencer/$(call FETCH_BUILD_NUMBER,$(E3_SITEMODS_PATH),sequencer)/bin/$(EPICS_HOST_ARCH) 2> /dev/null)
@@ -952,9 +939,7 @@ ${VERSIONFILE}:
 # EPICS R3.14.*:
 # Create file to fill registry from dbd file.
 ${REGISTRYFILE}: ${MODULEDBD}
-	$(RM) $@ temp.cpp
-	$(PERL) $(EPICS_BASE_HOST_BIN)/registerRecordDeviceDriver.pl $< $(basename $@) | grep -v iocshRegisterCommon > temp.cpp
-	$(MV) temp.cpp $@
+	$(PERL) $(EPICS_BASE_HOST_BIN)/registerRecordDeviceDriver.pl $< $(basename $@) > $@
 
 # 3.14.12 complains if this rule is not overwritten
 ./%Include.dbd: