diff --git a/phreeqcpp/spread.cpp b/phreeqcpp/spread.cpp
index 03cf4439..967c1c9f 100644
--- a/phreeqcpp/spread.cpp
+++ b/phreeqcpp/spread.cpp
@@ -1136,7 +1136,7 @@ copy_token_tab(std::string& token, const char **cptr)
  *      EOL,
  *      UNKNOWN.
  */
-	int i, j, return_value;
+	int i, return_value;
 	char c;
 /*
  *   Strip leading spaces
diff --git a/phreeqcpp/tidy.cpp b/phreeqcpp/tidy.cpp
index 12e892ff..4c95089b 100644
--- a/phreeqcpp/tidy.cpp
+++ b/phreeqcpp/tidy.cpp
@@ -1824,7 +1824,9 @@ tidy_punch(void)
 		for (size_t i = 0; i < current_selected_output->Get_totals().size(); i++)
 		{
 			std::pair< std::string, void *> &pair_ptr = current_selected_output->Get_totals()[i];
-			pair_ptr.second = master_bsearch(pair_ptr.first.c_str());
+			std::string noplus = pair_ptr.first;
+			replace(noplus, "+", "");
+			pair_ptr.second = master_bsearch(noplus.c_str());
 		}
 
 		/* molalities */