diff --git a/src/api/api_ast_vector.cpp b/src/api/api_ast_vector.cpp
index 5a1d974c1..40df13708 100644
--- a/src/api/api_ast_vector.cpp
+++ b/src/api/api_ast_vector.cpp
@@ -111,7 +111,7 @@ extern "C" {
             RETURN_Z3(0);
         }
         ast_translation translator(mk_c(c)->m(), mk_c(t)->m()); 
-        Z3_ast_vector_ref * new_v = alloc(Z3_ast_vector_ref, *mk_c(c), mk_c(t)->m());
+        Z3_ast_vector_ref * new_v = alloc(Z3_ast_vector_ref, *mk_c(t), mk_c(t)->m());
         mk_c(t)->save_object(new_v);
         unsigned sz = to_ast_vector_ref(v).size();
         for (unsigned i = 0; i < sz; i++) {
diff --git a/src/api/api_context.cpp b/src/api/api_context.cpp
index 43c95ecdd..45ed06ae9 100644
--- a/src/api/api_context.cpp
+++ b/src/api/api_context.cpp
@@ -131,7 +131,7 @@ namespace api {
         m_last_obj = 0;
         u_map<api::object*>::iterator it = m_allocated_objects.begin();
         while (it != m_allocated_objects.end()) {
-            //warning_msg("Junk: %d", it->m_key);
+            DEBUG_CODE(warning_msg("Uncollected memory: %d: %s", it->m_key, typeid(*it->m_value).name()););
             m_allocated_objects.remove(it->m_key);
             dealloc(it->m_value);
             it = m_allocated_objects.begin();
diff --git a/src/api/api_goal.cpp b/src/api/api_goal.cpp
index ed4816e09..295e1d939 100644
--- a/src/api/api_goal.cpp
+++ b/src/api/api_goal.cpp
@@ -156,7 +156,7 @@ extern "C" {
         LOG_Z3_goal_translate(c, g, target);
         RESET_ERROR_CODE();
         ast_translation translator(mk_c(c)->m(), mk_c(target)->m());
-        Z3_goal_ref * _r = alloc(Z3_goal_ref, *mk_c(c));
+        Z3_goal_ref * _r = alloc(Z3_goal_ref, *mk_c(target));
         _r->m_goal       = to_goal_ref(g)->translate(translator);
         mk_c(target)->save_object(_r);
         Z3_goal r = of_goal(_r);
diff --git a/src/api/api_solver.cpp b/src/api/api_solver.cpp
index 06bba37fc..518fa5384 100644
--- a/src/api/api_solver.cpp
+++ b/src/api/api_solver.cpp
@@ -103,7 +103,7 @@ extern "C" {
         LOG_Z3_solver_translate(c, s, target);
         RESET_ERROR_CODE();
         params_ref const& p = to_solver(s)->m_params; 
-        Z3_solver_ref * sr = alloc(Z3_solver_ref, *mk_c(c), 0);
+        Z3_solver_ref * sr = alloc(Z3_solver_ref, *mk_c(target), 0);
         init_solver(c, s);
         sr->m_solver = to_solver(s)->m_solver->translate(mk_c(target)->m(), p);
         mk_c(target)->save_object(sr);