diff --git a/ComputingTasks.cc b/ComputingTasks.cc
index dbdef0ec..1af68165 100644
--- a/ComputingTasks.cc
+++ b/ComputingTasks.cc
@@ -1291,8 +1291,7 @@ EstimatedParamsStatement::checkPass(ModFileStructure &mod_file_struct, WarningCo
 void
 EstimatedParamsStatement::writeOutput(ostream &output, const string &basename, bool minimal_workspace) const
 {
-  output << "global estim_params_" << endl
-         << "estim_params_.var_exo = [];" << endl
+  output << "estim_params_.var_exo = [];" << endl
          << "estim_params_.var_endo = [];" << endl
          << "estim_params_.corrx = [];" << endl
          << "estim_params_.corrn = [];" << endl
diff --git a/ExprNode.cc b/ExprNode.cc
index 66b479d2..c40dac37 100644
--- a/ExprNode.cc
+++ b/ExprNode.cc
@@ -3511,6 +3511,16 @@ BinaryOpNode::writeJsonOutput(ostream &output,
       return;
     }
 
+  if (op_code == oPowerDeriv)
+    {
+      output << "get_power_deriv(";
+      arg1->writeJsonOutput(output, temporary_terms, tef_terms);
+      output << ",";
+      arg2->writeJsonOutput(output, temporary_terms, tef_terms);
+      output << "," << powerDerivOrder << ")";
+      return;
+    }
+
   int prec = precedenceJson(temporary_terms);
 
   bool close_parenthesis = false;
diff --git a/SymbolTable.cc b/SymbolTable.cc
index c191060b..f1409587 100644
--- a/SymbolTable.cc
+++ b/SymbolTable.cc
@@ -110,7 +110,7 @@ SymbolTable::freeze() throw (FrozenException)
 
   frozen = true;
 
-  for (int i = 0; i < symbol_table.size(); i++)
+  for (int i = 0; i < (int) symbol_table.size(); i++)
     {
       int tsi;
       switch (getType(i))
diff --git a/SymbolTable.hh b/SymbolTable.hh
index 8bb11220..76aa3896 100644
--- a/SymbolTable.hh
+++ b/SymbolTable.hh
@@ -384,7 +384,7 @@ public:
 inline void
 SymbolTable::validateSymbID(int symb_id) const throw (UnknownSymbolIDException)
 {
-  if (symb_id < 0 || symb_id > symbol_table.size())
+  if (symb_id < 0 || symb_id > (int) symbol_table.size())
     throw UnknownSymbolIDException(symb_id);
 }
 
diff --git a/changed_files.txt b/changed_files.txt
deleted file mode 100644
index 2a6f3827..00000000
--- a/changed_files.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-
-license.txt
-
-windows/dynare.nsi