diff --git a/tgt-vhdl/scope.cc b/tgt-vhdl/scope.cc
index b6f19d57a..44c47bc1f 100644
--- a/tgt-vhdl/scope.cc
+++ b/tgt-vhdl/scope.cc
@@ -25,6 +25,15 @@
 #include <sstream>
 #include <cassert>
 
+/*
+ * Translate all the primitive logic gates into concurrent
+ * signal assignments.
+ */
+static void declare_logic(vhdl_arch *arch, ivl_scope_t scope)
+{
+   
+}
+
 /*
  * Declare all signals for a scope in an architecture.
  */
@@ -71,6 +80,9 @@ static vhdl_entity *create_entity_for(ivl_scope_t scope)
    // the architecture
    declare_signals(arch, scope);
 
+   // Similarly, add all the primitive logic gates
+   declare_logic(arch, scope);
+   
    // Build a comment to add to the entity/architecture
    std::ostringstream ss;
    ss << "Generated from Verilog module " << ivl_scope_tname(scope);
diff --git a/tgt-vhdl/vhdl_syntax.cc b/tgt-vhdl/vhdl_syntax.cc
index a4841f762..99ec94d5b 100644
--- a/tgt-vhdl/vhdl_syntax.cc
+++ b/tgt-vhdl/vhdl_syntax.cc
@@ -315,7 +315,7 @@ void vhdl_signal_decl::emit(std::ofstream &of, int level) const
 
 vhdl_expr::~vhdl_expr()
 {
-   if (type != NULL)
+   if (type_ != NULL)
       delete type_;
 }