diff --git a/scripts/mk_win_dist.py b/scripts/mk_win_dist.py
index e4a0c0542..57cd4c105 100644
--- a/scripts/mk_win_dist.py
+++ b/scripts/mk_win_dist.py
@@ -263,7 +263,6 @@ VS_RUNTIME_PATS = [re.compile('vcomp.*\.dll'),
 def cp_vs_runtime(x64):
     if x64:
         platform = "x64"
-
     else:
         platform = "x86"
     vcdir = os.environ['VCINSTALLDIR']
diff --git a/src/math/polynomial/polynomial.cpp b/src/math/polynomial/polynomial.cpp
index 2026df36c..444cab962 100644
--- a/src/math/polynomial/polynomial.cpp
+++ b/src/math/polynomial/polynomial.cpp
@@ -2184,10 +2184,16 @@ namespace polynomial {
             }
 
             ~som_buffer_vector() {
+                clear();
+            }
+
+            void clear() {
+                reset();
                 unsigned sz = m_buffers.size();
                 for (unsigned i = 0; i < sz; i++) {
                     dealloc(m_buffers[i]);
                 }
+                m_buffers.reset();
             }
 
             void set_owner(imp * owner) {
@@ -2372,11 +2378,14 @@ namespace polynomial {
                 m_polynomials.reset();
             });
             SASSERT(m_polynomials.empty());
+            m_iccp_ZpX_buffers.clear();
             m_monomial_manager->dec_ref();
         }
 
         void checkpoint() {
             if (!m_limit.inc()) {
+                m_som_buffer.reset();
+                m_som_buffer2.reset();
                 throw polynomial_exception(Z3_CANCELED_MSG);
             }
         }