diff --git a/ComputingTasks.cc b/ComputingTasks.cc
index 4a0ddcc6..39519eca 100644
--- a/ComputingTasks.cc
+++ b/ComputingTasks.cc
@@ -1937,7 +1937,7 @@ OptionsStatement::checkPass(ModFileStructure &mod_file_struct, WarningConsolidat
 void
 OptionsStatement::writeOutput(ostream &output, const string &basename) const
 {
-  string lhs_field = ".options";
+  string lhs_field = ".parameters.options";
 
   writeOptionsIndex(output, lhs_field);
   output << "estimation_info" << lhs_field <<"_index(options_indx) = {'" << name << "'};" << endl
diff --git a/ParsingDriver.cc b/ParsingDriver.cc
index db60330e..ef442d03 100644
--- a/ParsingDriver.cc
+++ b/ParsingDriver.cc
@@ -1358,7 +1358,7 @@ void
 ParsingDriver::set_std_options(string *name)
 {
   check_symbol_is_endogenous_or_exogenous(name);
-  //  mod_file->addStatement(new StdOptionsStatement(*name, options_list, mod_file->symbol_table));
+  mod_file->addStatement(new StdOptionsStatement(*name, options_list, mod_file->symbol_table));
   options_list.clear();
   delete name;
 }
@@ -1382,7 +1382,7 @@ ParsingDriver::set_corr_options(string *name1, string *name2)
 {
   check_symbol_is_endogenous_or_exogenous(name1);
   check_symbol_is_endogenous_or_exogenous(name2);
-  //  mod_file->addStatement(new CorrOptionsStatement(*name1, *name2, options_list, mod_file->symbol_table));
+  mod_file->addStatement(new CorrOptionsStatement(*name1, *name2, options_list, mod_file->symbol_table));
   options_list.clear();
   delete name1;
   delete name2;