diff --git a/mex/sources/bytecode/ErrorHandling.hh b/mex/sources/bytecode/ErrorHandling.hh
index cfe18a7b514a90a5652e56155aafceb01eac3eea..7a3e90646ecac965563fb248422f95f283a0ddb6 100644
--- a/mex/sources/bytecode/ErrorHandling.hh
+++ b/mex/sources/bytecode/ErrorHandling.hh
@@ -34,8 +34,8 @@
 
 #include "dynmex.h"
 
-#define BYTE_CODE
-#include "CodeInterpreter.hh"
+#define BYTECODE_MEX
+#include "Bytecode.hh"
 
 using namespace std;
 
@@ -1186,9 +1186,9 @@ public:
                     {
                       int derivOrder = static_cast<int>(nearbyint(Stackf.top()));
                       Stackf.pop();
-                      if (fabs(v1f) < near_zero && v2f > 0
+                      if (fabs(v1f) < power_deriv_near_zero && v2f > 0
                           && derivOrder > v2f
-                          && fabs(v2f-nearbyint(v2f)) < near_zero)
+                          && fabs(v2f-nearbyint(v2f)) < power_deriv_near_zero)
                         {
                           r = 0.0;
                           Stackf.push(r);
diff --git a/mex/sources/bytecode/Evaluate.cc b/mex/sources/bytecode/Evaluate.cc
index ad77ad96d129dc5f6e675a22218918bd6c2367c2..c8296a9f69f6ef6cf2c3cd90c99032cc46d4a1da 100644
--- a/mex/sources/bytecode/Evaluate.cc
+++ b/mex/sources/bytecode/Evaluate.cc
@@ -22,6 +22,7 @@
 #include <limits>
 
 #include "Evaluate.hh"
+#include "CommonEnums.hh"
 
 #ifdef MATLAB_MEX_FILE
 extern "C" bool utIsInterruptPending();
@@ -882,9 +883,9 @@ Evaluate::compute_block_time(int Per_u_, bool evaluate, bool no_derivative)
                 Stack.pop();
                 try
                   {
-                    if (fabs(v1) < near_zero && v2 > 0
+                    if (fabs(v1) < power_deriv_near_zero && v2 > 0
                         && derivOrder > v2
-                        && fabs(v2-nearbyint(v2)) < near_zero)
+                        && fabs(v2-nearbyint(v2)) < power_deriv_near_zero)
                       Stack.push(0.0);
                     else
                       {
diff --git a/mex/sources/bytecode/Evaluate.hh b/mex/sources/bytecode/Evaluate.hh
index bd54285fee645498c6458f4adf7d6bb6fb68f28e..9feace69da4959c2a1954e0080f8244ada86e75b 100644
--- a/mex/sources/bytecode/Evaluate.hh
+++ b/mex/sources/bytecode/Evaluate.hh
@@ -25,8 +25,8 @@
 
 #include "dynmex.h"
 
-#define BYTE_CODE
-#include "CodeInterpreter.hh"
+#define BYTECODE_MEX
+#include "Bytecode.hh"
 #include "ErrorHandling.hh"
 
 class Evaluate : public ErrorMsg
diff --git a/mex/sources/bytecode/Interpreter.hh b/mex/sources/bytecode/Interpreter.hh
index 58a19755b8cae4b76d427406c89843f9c18f1aae..995e755a7ea90b47dab0fd0e7ec0d6bccf6209db 100644
--- a/mex/sources/bytecode/Interpreter.hh
+++ b/mex/sources/bytecode/Interpreter.hh
@@ -28,8 +28,8 @@
 
 #include "ErrorHandling.hh"
 #include "SparseMatrix.hh"
-#define BYTE_CODE
-#include "CodeInterpreter.hh"
+#define BYTECODE_MEX
+#include "Bytecode.hh"
 
 using namespace std;
 
diff --git a/preprocessor b/preprocessor
index 41b1e897569763c6688894597b7cab0cbb14a83d..a85730313caa4025f2a08639f26e5a1bf47dfab0 160000
--- a/preprocessor
+++ b/preprocessor
@@ -1 +1 @@
-Subproject commit 41b1e897569763c6688894597b7cab0cbb14a83d
+Subproject commit a85730313caa4025f2a08639f26e5a1bf47dfab0