diff --git a/src/apex/simulated_annealing.cpp b/src/apex/simulated_annealing.cpp
index 08669171..6ed8a299 100644
--- a/src/apex/simulated_annealing.cpp
+++ b/src/apex/simulated_annealing.cpp
@@ -32,7 +32,9 @@ size_t SimulatedAnnealing::get_max_iterations() {
     }
     //return max_iter / vars.size();
     //return max_iter * vars.size() *vars.size();
-    return std::min(max_iterations, (std::max(min_iterations, max_iter*max_iter)));
+    auto foo = std::min(max_iterations, (std::max(min_iterations, max_iter*vars.size())));
+    //std::cout << "Max iterations: " << foo << std::endl;
+    return foo;
 }
 
 double SimulatedAnnealing::acceptance_probability(double new_cost) {
diff --git a/src/apex/trace_event_listener.cpp b/src/apex/trace_event_listener.cpp
index b3890ba7..ff47348a 100644
--- a/src/apex/trace_event_listener.cpp
+++ b/src/apex/trace_event_listener.cpp
@@ -537,7 +537,6 @@ void trace_event_listener::flush_trace_if_necessary(bool force) {
 void trace_event_listener::close_trace(void) {
     static bool closed{false};
     if (closed) return;
-    flush_trace(this);
     auto& trace_file = get_trace_file();
     std::stringstream ss;
     ss.precision(3);
@@ -549,6 +548,7 @@ void trace_event_listener::close_trace(void) {
     ss << "]\n";
     ss << "}\n" << std::endl;
     write_to_trace(ss);
+    flush_trace(this);
     //printf("Closing trace...\n"); fflush(stdout);
     trace_file.close();
     closed = true;