diff --git a/vvp/vpi_scope.cc b/vvp/vpi_scope.cc
index a69dea7745..c0743647a1 100644
--- a/vvp/vpi_scope.cc
+++ b/vvp/vpi_scope.cc
@@ -63,8 +63,6 @@ static void delete_sub_scopes(struct __vpiScope *scope)
 		  vthreads_delete(lscope);
 		  delete (scope->intern)[idx];
 		  break;
-		case vpiIntegerVar:
-		  break;
 		case vpiMemory:
 		case vpiNetArray:
 		  memory_delete((scope->intern)[idx]);
@@ -78,6 +76,11 @@ static void delete_sub_scopes(struct __vpiScope *scope)
 		  break;
 		case vpiNet:
 		case vpiReg:
+		case vpiIntegerVar:
+		case vpiLongIntVar:
+		case vpiShortIntVar:
+		case vpiIntVar:
+		case vpiByteVar:
 		  signal_delete((scope->intern)[idx]);
 		  break;
 		case vpiParameter:
diff --git a/vvp/vpi_signal.cc b/vvp/vpi_signal.cc
index 90e924e649..2aaa326cab 100644
--- a/vvp/vpi_signal.cc
+++ b/vvp/vpi_signal.cc
@@ -997,6 +997,8 @@ vpiHandle vpip_make_int2(const char*name, int msb, int lsb, vvp_net_t*vec)
 	  case 63:
 	    obj->vpi_type = &vpip_longint_rt;
 	    break;
+	  default:
+	    assert(0);
       }
 
       return obj;
diff --git a/vvp/vvp_net.cc b/vvp/vvp_net.cc
index a1a5acc758..40e978cfbe 100644
--- a/vvp/vvp_net.cc
+++ b/vvp/vvp_net.cc
@@ -155,9 +155,6 @@ vvp_net_t::vvp_net_t()
       out_ = vvp_net_ptr_t(0,0);
       fun = 0;
       fil = 0;
-#ifdef CHECK_WITH_VALGRIND
-      pool = NULL;
-#endif
 }
 
 void vvp_net_t::link(vvp_net_ptr_t port_to_link)