diff --git a/src/daqd/net_writer.cc b/src/daqd/net_writer.cc
index 08fe705e7a488155faf8aaa2258b143da948c0a0..32aa1844c396d75f2a62f181d8f7b970962c0578 100644
--- a/src/daqd/net_writer.cc
+++ b/src/daqd/net_writer.cc
@@ -929,11 +929,6 @@ net_writer_c::consumer( )
                 char* data = buffptr->block_ptr( nb );
                 for ( int i = 0; i < num_channels; i++ )
                 {
-                    printf( "Byteswap %s rate=%d type=%d\n",
-                            channels[ i ].name,
-                            channels[ i ].sample_rate,
-                            channels[ i ].data_type );
-
                     if ( channels[ i ].bps == 4 )
                     {
                         for ( int j = 0; j < channels[ i ].sample_rate; j++ )
diff --git a/src/epics/util/Makefile.kernel b/src/epics/util/Makefile.kernel
index 121633eac359ddff5137bb5ba194527fb6facfb5..a949ab6b350d81bacd088ba75c65ec148621aaa7 100644
--- a/src/epics/util/Makefile.kernel
+++ b/src/epics/util/Makefile.kernel
@@ -17,6 +17,12 @@ $(shell cp -rp $(RCG_SRC)/src/fe/ $(mkfile_dir)/src/)
 $(shell cp -rp $(RCG_SRC)/src/drv/ $(mkfile_dir)/src/)
 $(shell cp -rp $(RCG_SRC)/src/shmem/ $(mkfile_dir)/src/)
 
+# We always want to take these values from the below 
+# KernelVars.mk script and not the ENV
+undefine IOP_MODEL
+undefine BUILD_WITH_DOLPHIN
+
+
 # Include the generated make variables, written by
 # the feCodeGen.pl script.
 include $(mkfile_dir)/KernelVars.mk
diff --git a/src/epics/util/lib/Parser3.pm b/src/epics/util/lib/Parser3.pm
index ebaa59d72baa23302d91b1d789fc98bcca74fac1..e854a32a82266819f659b224ed1d42ed40cfb472 100644
--- a/src/epics/util/lib/Parser3.pm
+++ b/src/epics/util/lib/Parser3.pm
@@ -643,7 +643,7 @@ sub node_processing {
 		return 1; # Do not call this function on leaves, we already did that
 	} elsif ($block_type eq "Reference") {
                 if ($source_block =~ /cdsIPCx/) {
-                   if ($block_name !~ /[CGHKLMSX]\d\:/) {
+                   if ($block_name !~ /[A-Z]\d\:/) {
                       die "***ERROR: Signal name of IPCx module must include IFO: $block_name\n";
                    }
                 }
diff --git a/src/gds/awgtpman/testpoint.c b/src/gds/awgtpman/testpoint.c
index 09d3a2df980f03b6cebd492abc28cabee78dbbe5..d046615ecd3b1c124afbe8cde6ca4e269cd54d18 100644
--- a/src/gds/awgtpman/testpoint.c
+++ b/src/gds/awgtpman/testpoint.c
@@ -11,6 +11,7 @@
 #include "dtt/gdserrmsg.h"
 #include "tconv.h"
 #include "testpoint_interface_v3.h"
+#include "testpoint.h"
 
 #if defined (_CONFIG_DYNAMIC)
 #include "confinfo.h"
diff --git a/src/include/fe.h b/src/include/fe.h
index a6df4d44d10d338684b1955e2d8396f74fd3588e..82a67cbc808ed9cd3c961b7bac7f82ffec787ce4 100644
--- a/src/include/fe.h
+++ b/src/include/fe.h
@@ -5,8 +5,11 @@
 #include "controllerko.h" //CDIO* Globals and tdsControl/tdsCount
 
 #include "modelRateInfo.h" ////CYCLE_PER_SECOND, FE_RATE
+#include "qnorm.h"
 #include "util/inlineMath.h"
 #include "util/timing.h"
+#include "util/random_bytes.h"
+#include "util/prng_xoroshiroPP.h"
 #include "fm10Gen.h"
 #include "tRamp.h"
 #include "isnan.h"
diff --git a/src/include/qnorm.h b/src/include/qnorm.h
index a3700d1ce30d699cd9ec38e7d076b62b7f698f44..97e0f5528f5a5a44e896bf08b1bb745a1d44b824 100644
--- a/src/include/qnorm.h
+++ b/src/include/qnorm.h
@@ -106,7 +106,7 @@
 #ifndef LIGO_QNORM_H
 #define LIGO_QNORM_H
 
-#include "inlineMath.h"
+#include "util/inlineMath.h"
 
 
 #define ML_POSINF   (1.0 / 0.0)